From e711c834aec2293c53b07efe53e81e3573c289b6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 01 四月 2026 11:42:44 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
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 1c10002..20b9a6c 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
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
+import com.vincent.rsf.server.manager.utils.WarehouseLocationRetrievalUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.extern.slf4j.Slf4j;
@@ -76,7 +77,7 @@
if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
}
- if (!basStation.getUseStatus().equals("O")) {
+ if (!basStation.getUseStatus().equals("O") && !basStation.getUseStatus().equals("D") && !basStation.getUseStatus().equals("F")) {
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
@@ -185,9 +186,11 @@
// }
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) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_D.type)) ) {
+ if (Objects.isNull(station) || (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_D.type)) ) {
throw new CoolException("绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撱�佺┖鏉跨姸鎬侊紒锛�");
}
+ station.setBarcode("");
+ basStationService.updateById(station);
StringBuilder errorBuilder = new StringBuilder();
List<Long> areaTypeList = LocUtils.getAreaTypeList(station.getStationName());
if (areaTypeList.isEmpty()) {
@@ -212,14 +215,20 @@
// throw new CoolException("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
}
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getSite, station.getStationName())
- .eq(DeviceSite::getAreaIdEnd, warehouseArea.getId())
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_IN.type).last("limit 1"));
- if (Cools.isEmpty(deviceSite)) {
+ boolean isItAvailable = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableInArea(station.getStationName(), warehouseArea.getId(), param.getContainerNo(), TaskType.TASK_TYPE_EMPTY_IN.type);
+// DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+// .eq(DeviceSite::getSite, )
+// .eq(DeviceSite::getAreaIdEnd,)
+// .eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_IN.type).last("limit 1"));
+// if (Cools.isEmpty(deviceSite)) {
+// errorBuilder.append("鏃犲彲鐢ㄨ矾寰�");
+// continue;
+// throw new CoolException("鏃犲彲鐢ㄨ矾寰勶紒锛�");
+// }
+ if (!isItAvailable){
errorBuilder.append("鏃犲彲鐢ㄨ矾寰�");
continue;
-// throw new CoolException("鏃犲彲鐢ㄨ矾寰勶紒锛�");
+
}
// BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
@@ -242,16 +251,7 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
}
- String stationName = null;
- if (Cools.isEmpty(deviceSite.getDeviceCode())) {
- stationName = station.getStationName();
- } else {
- BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
- stationName = stationCode.getStationName();
- if (Cools.isEmpty(stationCode)) {
- stationName = station.getStationName();
- }
- }
+ String stationName = station.getStationName();
Task task = new Task();
task.setTaskCode(ruleCode)
.setTaskStatus(TaskStsType.MISSION_INITIAL.id)
@@ -267,13 +267,23 @@
if (!taskService.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
}
- station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
-
+ if (!station.getType().equals(0)){
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ }
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
}
- if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())
- .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, param.getContainerNo()))) {
+ Loc taskLoc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, task.getTargLoc())
+ .last("limit 1"), false);
+ if (Objects.isNull(taskLoc)) {
+ throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
+ }
+ taskLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type)
+ .setBarcode(param.getContainerNo())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+ if (!locService.updateById(taskLoc)) {
throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
}
return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
@@ -286,7 +296,7 @@
if (Cools.isEmpty(param.getTransferStationNo())) {
return R.error("鏃犲弬鏁�");
}
- BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationId, param.getTransferStationNo()));
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, param.getTransferStationNo()));
if (Cools.isEmpty(basStation)) {
return R.error("鏈壘鍒板尮閰嶇珯鐐�");
}
@@ -320,11 +330,11 @@
.setTaskCode(ruleCode)
.setOrgLoc(loc.getCode())
.setTargSite(station.getStationName())
- .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
- .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
+ .setResource(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val)
+ .setTaskType(TaskType.TASK_TYPE_OUT.type)
.setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
- .setBarcode(param.getContainerNo())
+ .setBarcode(loc.getBarcode())
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
@@ -349,7 +359,7 @@
.setSplrBatch(item.getBatch())
.setPlatWorkCode(item.getPlatWorkCode())
.setPlatItemId(item.getPlatItemId())
- .setOrderType(OrderType.ORDER_IN.type)
+ .setOrderType(OrderType.ORDER_OUT.type)
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
taskItems.add(taskItem);
}
@@ -363,5 +373,4 @@
}
return R.ok();
}
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1