From 1aebdca4fee83fc0153efcdfe72db6fee606e6ba Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 27 一月 2026 09:43:53 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 68 insertions(+), 50 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 2cd8353..14a1b1b 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
@@ -176,67 +176,85 @@
// }
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("绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撶姸鎬侊紒锛�");
+ if (Objects.isNull(station) || (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_D.type)) ) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撱�佺┖鏉跨姸鎬侊紒锛�");
}
- DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(station.getStationName()));
- if (Cools.isEmpty(deviceBind)) {
- throw new CoolException("搴撲綅瑙勫垯鏈煡");
- }
- WarehouseAreas warehouseArea = warehouseAreasService.getById(deviceBind.getTypeId());
- if (Cools.isEmpty(warehouseArea)) {
- throw new CoolException("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
- }
+ StringBuilder errorBuilder = new StringBuilder();
+ List<Long> areaTypeList = LocUtils.getAreaTypeList(station.getStationName());
+ for (Long areaType : areaTypeList) {
+ if (errorBuilder.length() > 0) {
+ errorBuilder.append(",");
+ }
+ errorBuilder.append("璺緞ID锛�");
+ errorBuilder.append(areaType);
+ DeviceBind deviceBind = deviceBindService.getById(areaType);
+ if (Cools.isEmpty(deviceBind)) {
+ errorBuilder.append("搴撲綅瑙勫垯鏈煡");
+ continue;
+// throw new CoolException("搴撲綅瑙勫垯鏈煡");
+ }
+ WarehouseAreas warehouseArea = warehouseAreasService.getById(deviceBind.getTypeId());
+ if (Cools.isEmpty(warehouseArea)) {
+ errorBuilder.append("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
+ continue;
+// 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_EMPITY_IN.type).last("limit 1"));
- if (Cools.isEmpty(deviceSite)) {
- 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_EMPITY_IN.type).last("limit 1"));
+ if (Cools.isEmpty(deviceSite)) {
+ errorBuilder.append("鏃犲彲鐢ㄨ矾寰�");
+ continue;
+// throw new CoolException("鏃犲彲鐢ㄨ矾寰勶紒锛�");
+ }
// BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
// .eq(BasContainer::getCode, param.getContainerNo()));
// if (Objects.isNull(container)) {
// throw new CoolException("瀹瑰櫒鏈淮鎶ゅ叆搴擄紝璇风淮鎶ゅ悗鍐嶆搷浣滐紒锛�");
// }
- //楠岃瘉鍩虹淇℃伅
- checkStaStatus(param.getContainerNo(), param.getTransferStationNo());
- /**鑾峰彇搴撲綅*/
- String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId(), null);
- if (Cools.isEmpty(targetLoc)) {
- throw new CoolException("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
- }
+ //楠岃瘉鍩虹淇℃伅
+ checkStaStatus(param.getContainerNo(), param.getTransferStationNo());
+ /**鑾峰彇搴撲綅*/
+ String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId(), null);
+ if (Cools.isEmpty(targetLoc)) {
+ errorBuilder.append("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
+ continue;
+// throw new CoolException("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
+ }
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
- }
- Task task = new Task();
- task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
- .setTaskType(TaskType.TASK_TYPE_EMPITY_IN.type)
- .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh寰呬慨鏀�
- .setTargLoc(targetLoc)
- .setOrgSite(station.getStationName())
- .setBarcode(param.getContainerNo())
- .setTargSite(deviceSite.getDeviceCode())
- .setCreateBy(loginUserId)
- .setUpdateBy(loginUserId);
- if (!taskService.save(task)) {
- throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
- }
- station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
+ }
+ Task task = new Task();
+ task.setTaskCode(ruleCode)
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskType(TaskType.TASK_TYPE_EMPITY_IN.type)
+ .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh寰呬慨鏀�
+ .setTargLoc(targetLoc)
+ .setOrgSite(station.getStationName())
+ .setBarcode(param.getContainerNo())
+ .setTargSite(deviceSite.getDeviceCode())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId);
+ if (!taskService.save(task)) {
+ throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
+ }
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+ 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()))) {
+ throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
+ }
+ return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
}
- 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()))) {
- throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
- }
- return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
+ return R.error(errorBuilder.toString()).add(errorBuilder.toString());
}
@Override
--
Gitblit v1.9.1