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/manager/service/impl/LocItemServiceImpl.java | 171 +++++++++++++++++++++++++++------------------------------
1 files changed, 81 insertions(+), 90 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index b435656..e6f051c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
@@ -12,9 +13,13 @@
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.LocItemMapper;
+import com.vincent.rsf.server.manager.mapper.TaskMapper;
+import com.vincent.rsf.server.manager.mapper.WaveMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.Synchronized;
@@ -23,6 +28,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,19 +43,18 @@
@Autowired
private LocService locService;
@Autowired
- private TaskService taskService;
+ private TaskMapper taskMapper;
@Autowired
private TaskItemService taskItemService;
@Autowired
- private LocItemService locItemService;
- @Autowired
private DeviceSiteService deviceSiteService;
@Autowired
+ @Lazy
private WcsService wcsService;
@Autowired
- private OutStockService outStockService;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
- private WaveService waveService;
+ private WaveMapper waveMapper;
@Autowired
private BasStationService basStationService;
@Autowired
@@ -58,6 +63,8 @@
private CheckDiffService checkDiffService;
@Autowired
private CheckDiffItemService checkDiffItemService;
+ @Autowired
+ private WarehouseAreasServiceImpl warehouseAreasService;
/**
@@ -109,20 +116,18 @@
.setBarcode(loc.getBarcode())
.setMemo(map.getMemo());
- if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK_EMPTY)) {
- //绌哄鍣ㄥ嚭搴�
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
- .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_OUT.type).last("limit 1"));
- if (Objects.isNull(deviceSite)) {
- throw new CoolException("绔欑偣涓嶆敮鎸佺┖瀹瑰櫒鍑哄簱锛侊紒");
- }
- task.setTaskType(TaskType.TASK_TYPE_EMPTY_OUT.type).setWarehType(deviceSite.getDevice());
+ if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK_EMPTY)) {//绌哄鍣ㄥ嚭搴�
+ boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_EMPTY_OUT.type.toString());
+ if (!available) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佺┖瀹瑰櫒鍑哄簱锛侊紒");
+ }
+ WarehouseAreas warehouseAreas = warehouseAreasService.getById(loc.getAreaId());
+ task.setTaskType(TaskType.TASK_TYPE_EMPTY_OUT.type).setWarehType(warehouseAreas.getType());
} else {
throw new CoolException("绌哄鍣ㄥ嚭搴擄紒锛佸叾浠栫被鍨嬫棤鏁堬紝杩涘叆绫诲瀷锛�"+map.getType());
}
- if (!taskService.save(task)) {
+ if (taskMapper.insert(task) <= 0) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
}
@@ -155,10 +160,10 @@
if (!Objects.isNull(map.getSourceId())) {
if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
order = new WkOrder();
- wave = waveService.getById(map.getSourceId());
+ wave = waveMapper.selectById(map.getSourceId());
} else {
wave = new Wave();
- order = outStockService.getById(map.getSourceId());
+ order = asnOrderMapper.selectById(map.getSourceId());
}
} else {
wave = new Wave();
@@ -183,8 +188,7 @@
}
//澧炲姞瀵瑰璐у崟鐨勫垽鏂�
- Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
- ? TaskStsType.MISSION_INITIAL.id:TaskStsType.MISSION_INITIAL.id;
+ Integer taskStatus = TaskStsType.MISSION_INITIAL.id;
Task moveTask = new Task();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
@@ -217,81 +221,53 @@
|| map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
if (orgQty.compareTo(outQty) > 0) {
//鎷ｆ枡鍑哄簱 -- 鐩樼偣鍑哄簱
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getSite, siteNo)
- .eq(!Objects.isNull(loc.getChannel()),DeviceSite::getChannel, loc.getChannel())
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).last("limit 1"),false);
- if (Objects.isNull(deviceSite)) {
- throw new CoolException("绔欑偣涓嶆敮鎸佹嫞鏂欏嚭搴擄紒锛�");
+ boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
+ if (!available) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佹瀹瑰櫒鎷ｉ�夊嚭搴擄紒锛�");
}
- task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).setWarehType(deviceSite.getDevice());
+ WarehouseAreas warehouseAreas = warehouseAreasService.getById(loc.getAreaId());
+ task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).setWarehType(warehouseAreas.getType());
} else {
- if (resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)){
+ if (resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)){
//鍏ㄦ澘鍑哄簱
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)
- .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()).last("limit 1"));
- if (Objects.isNull(deviceSite)) {
+ boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type);
+ if (!available) {
throw new CoolException("绔欑偣涓嶆敮鎸佽秺搴擄紒锛�");
}
- task.setTaskType(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type).setWarehType(deviceSite.getDevice());//瓒婂簱
+ WarehouseAreas warehouseAreas = warehouseAreasService.getById(loc.getAreaId());
+ task.setTaskType(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type).setWarehType(warehouseAreas.getType());//瓒婂簱
} else {
//鍏ㄦ澘鍑哄簱
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_OUT.type)
- .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()).last("limit 1"));
- if (Objects.isNull(deviceSite)) {
+ boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_OUT.type);
+ if (!available) {
throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
}
- task.setTaskType(TaskType.TASK_TYPE_OUT.type).setWarehType(deviceSite.getDevice());
+ WarehouseAreas warehouseAreas = warehouseAreasService.getById(loc.getAreaId());
+ task.setTaskType(TaskType.TASK_TYPE_OUT.type).setWarehType(warehouseAreas.getType());
}
}
} else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
//鐩樼偣鍑哄簱
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
- .eq(DeviceSite::getSite, siteNo)
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type).last("limit 1"));
- if (Objects.isNull(deviceSite)) {
+ boolean available = new WarehouseLocationRetrievalUtil().queryPathIsItAvailableOutArea(loc.getAreaId().toString(), siteNo, loc.getBarcode(),TaskType.TASK_TYPE_CHECK_OUT.type);
+ if (!available) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
}
- task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
+ WarehouseAreas warehouseAreas = warehouseAreasService.getById(loc.getAreaId());
+ task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(warehouseAreas.getType());
}
- if (!taskService.save(task)) {
+ if (taskMapper.insert(task) <= 0) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
-// if (!LocUtils.isShallowLoc(loc.getCode())) {
-// //鑾峰彇娣卞簱浣嶅搴旀祬搴撲綅
-// String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
-// Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
-// if (Objects.isNull(one)) {
-// throw new CoolException("瀵瑰簲搴撲綅涓嶅瓨鍦紒锛�");
-// }
-// Task workTask = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, one.getBarcode()));
-// if (Objects.isNull(workTask)) {
-// map.setOrgLoc(one.getCode());
-// //浼樺厛鐢熸垚绉诲簱浠诲姟
-// if (one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
-// moveTask = genMoveTask(map, loginUserId);
-// }
-// } else {
-// workTask.setSort(task.getSort() + 1).setParentId(task.getId());
-// if (!taskService.updateById(workTask)) {
-// throw new CoolException("浼樺厛绾т慨鏀瑰け璐ワ紒锛�");
-// }
-// }
-// }
-
if (!Objects.isNull(moveTask.getId())) {
moveTask.setParentId(task.getId()).setSort(moveTask.getSort() + 1);
- if (!taskService.saveOrUpdate(moveTask)) {
+ if ((Objects.isNull(moveTask.getId()) ? taskMapper.insert(moveTask) : taskMapper.updateById(moveTask)) <= 0) {
throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
}
task.setParentId(moveTask.getId());
- if (!taskService.updateById(task)) {
+ if (taskMapper.updateById(task) <= 0) {
throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
}
}
@@ -328,7 +304,7 @@
taskItems.add(taskItem);
Double qty = Math.round((item.getWorkQty() + item.getOutQty()) * 10000) / 10000.0;
- LocItem locItem = locItemService.getById(item.getId());
+ LocItem locItem = this.getById(item.getId());
if (Objects.isNull(locItem)) {
throw new CoolException("搴撳瓨淇℃伅涓嶅瓨鍦紒");
}
@@ -345,7 +321,7 @@
}
item.setUpdateBy(loginUserId).setUpdateTime(new Date());
- if (!locItemService.updateById(item)) {
+ if (!this.updateById(item)) {
throw new CoolException("搴撳瓨淇℃伅淇敼澶辫触锛侊紒");
}
@@ -463,24 +439,39 @@
Loc targetLoc;
if (Objects.isNull(map.getTarLoc()) || StringUtils.isBlank(map.getTarLoc())) {
//鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅
- DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)
- .eq(!Objects.isNull(orgLoc.getChannel()), DeviceSite::getChannel, orgLoc.getChannel()).last("limit 1"), false);
- if (Objects.isNull(deviceSite)) {
- throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
+
+ List<String> outWarehouseAreasByReservoirAreaAndContainer = new WarehouseLocationRetrievalUtil().getOutWarehouseAreasByReservoirAreaAndContainer(orgLoc.getAreaId(), orgLoc.getBarcode(), TaskType.TASK_TYPE_LOC_MOVE.type);
+ if (!Cools.isEmpty(outWarehouseAreasByReservoirAreaAndContainer) || outWarehouseAreasByReservoirAreaAndContainer.isEmpty()) {
+ throw new CoolException("鏈壘鍒板彲鐢ㄧ洰鏍囧簱鍖猴紒锛侊紒婧愬簱鍖猴細"+orgLoc.getAreaId());
}
- TaskInParam param = new TaskInParam();
- param.setIoType(TaskType.TASK_TYPE_OUT.type)
- .setOrgLoc(map.getOrgLoc())
- .setSourceStaNo(deviceSite.getSite())
- .setLocType1(Integer.parseInt(orgLoc.getType())
- );
- InTaskMsgDto locNo;
- try {
- locNo = wcsService.getLocNo(param);
- } catch (Exception e) {
- log.error("<UNK>", e);
- throw new CoolException(e.getMessage());
+ InTaskMsgDto locNo = null;
+ for (String areaId : outWarehouseAreasByReservoirAreaAndContainer) {
+ List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, orgLoc.getCode()));
+ boolean sign = false;
+ for (LocItem locItem : locItems) {
+ if (!new WarehouseLocationRetrievalUtil().retrieveMatnrIsItAvailable(areaId, locItem.getMatnrId())){
+ sign = true;
+ break;
+ }
+ }
+ if (sign) {
+ continue;
+ }
+ TaskInParam param = new TaskInParam();
+ param.setIoType(TaskType.TASK_TYPE_OUT.type)
+ .setOrgLoc(map.getOrgLoc())
+ .setAreaId(Long.parseLong(areaId))
+ .setLocType1(Integer.parseInt(orgLoc.getType())
+ );
+ try {
+ locNo = wcsService.getLocNoArea(param);
+ break;
+ } catch (Exception e) {
+ log.error("<UNK>", e);
+ }
+ }
+ if (Cools.isEmpty(locNo)){
+ throw new CoolException("绉诲簱鏈壘鍒板彲鐢ㄥ簱浣嶏紒锛侊紒");
}
targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locNo.getLocNo()));
} else {
@@ -511,11 +502,11 @@
.setBarcode(orgLoc.getBarcode())
.setMemo(map.getMemo());
- if (!taskService.save(task)) {
+ if (taskMapper.insert(task) <= 0) {
throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
}
- List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
+ List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
if (!locItems.isEmpty()) {
List<TaskItem> taskItems = new ArrayList<>();
for (LocItem item : locItems) {
@@ -555,6 +546,6 @@
.eq(StringUtils.isNotBlank(matnr.getLocCode()), LocItem::getLocCode, matnr.getLocCode())
// .eq(StringUtils.isNotBlank(matnr.getChannel()), LocItem::getChannel, matnr.getChannel())
.in(!matnr.getMatnrCode().isEmpty(), LocItem::getMatnrCode, matnr.getMatnrCode());
- return this.baseMapper.listByMatnr(LocStsType.LOC_STS_TYPE_F.type, matnr.getChannel(), wrapper);
+ return this.baseMapper.listByMatnr(LocStsType.LOC_STS_TYPE_F.type, matnr.getChannel(), wrapper);
}
}
--
Gitblit v1.9.1