From d91fae31f20fa81081fe1b0769437be66470175d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 03 三月 2026 14:38:25 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 656613d..b81ea09 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
@@ -51,6 +51,8 @@
private WaveService waveService;
@Autowired
private BasStationService basStationService;
+ @Autowired
+ private LocItemWorkingService locItemWorkingService;
/**
@@ -65,7 +67,7 @@
@Override
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public synchronized void generateTaskEmpty(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception {
+ public synchronized void generateTaskEmpty(Short resouce, LocToTaskParams map, Long loginUserId, String taskNo) throws Exception {
if (Objects.isNull(map.getSiteNo())) {
throw new CoolException("鐩爣绔欑偣涓嶈兘涓虹┖锛�");
}
@@ -88,7 +90,7 @@
if (!locService.updateById(loc)) {
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
}
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ String ruleCode = StringUtils.isBlank(taskNo) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null) : taskNo;
task.setOrgLoc(loc.getCode())
.setTaskCode(ruleCode)
.setResource(resouce)
@@ -98,7 +100,7 @@
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateTime(new Date())
- .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setBarcode(loc.getBarcode())
.setMemo(map.getMemo());
@@ -106,11 +108,11 @@
//绌哄鍣ㄥ嚭搴�
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_EMPITY_OUT.type));
+ .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_EMPITY_OUT.type).setWarehType(deviceSite.getDevice());
+ task.setTaskType(TaskType.TASK_TYPE_EMPTY_OUT.type).setWarehType(deviceSite.getDevice());
} else {
throw new CoolException("绌哄鍣ㄥ嚭搴擄紒锛佸叾浠栫被鍨嬫棤鏁堬紝杩涘叆绫诲瀷锛�"+map.getType());
}
@@ -174,6 +176,11 @@
if (!locService.updateById(loc)) {
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
}
+
+ //澧炲姞瀵瑰璐у崟寰楀垽鏂�
+ Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
+ ? TaskStsType.MISSION_INITIAL.id:TaskStsType.MISSION_INITIAL.id;
+
Task moveTask = new Task();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
task.setOrgLoc(loc.getCode())
@@ -185,7 +192,7 @@
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateTime(new Date())
- .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setTaskStatus(taskStatus)
.setBarcode(loc.getBarcode())
.setMemo(map.getMemo());
@@ -206,20 +213,31 @@
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));
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).last("limit 1"),false);
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣涓嶆敮鎸佹嫞鏂欏嚭搴擄紒锛�");
}
task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).setWarehType(deviceSite.getDevice());
} else {
- //鍏ㄦ澘鍑哄簱
- 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_OUT.type));
- if (Objects.isNull(deviceSite)) {
- throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
+ if (resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.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)) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佽秺搴擄紒锛�");
+ }
+ task.setTaskType(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type).setWarehType(deviceSite.getDevice());//瓒婂簱
+ } 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)) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
+ }
+ task.setTaskType(TaskType.TASK_TYPE_OUT.type).setWarehType(deviceSite.getDevice());
}
- task.setTaskType(TaskType.TASK_TYPE_OUT.type).setWarehType(deviceSite.getDevice());
}
} else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
@@ -227,7 +245,7 @@
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));
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type).last("limit 1"));
if (Objects.isNull(deviceSite)) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
}
@@ -270,6 +288,7 @@
throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
}
}
+ locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
List<TaskItem> taskItems = new ArrayList<>();
listMap.get(key).forEach(item -> {
@@ -324,6 +343,21 @@
if (!locItemService.updateById(item)) {
throw new CoolException("搴撳瓨淇℃伅淇敼澶辫触锛侊紒");
}
+
+ if (taskItem.getAnfme() > 0) {
+ LocItemWorking itemWorking = new LocItemWorking();
+ BeanUtils.copyProperties(taskItem, itemWorking);
+ itemWorking.setTaskId(task.getId())
+ .setQty(0.0)
+ .setLocId(loc.getId())
+ .setLocItemId(locItem.getId())
+ .setType("out")
+ .setLocCode(loc.getCode());
+
+ if (!locItemWorkingService.save(itemWorking)) {
+ throw new CoolException("涓存椂搴撳瓨鏇存柊澶辫触锛侊紒");
+ }
+ }
});
if (!taskItemService.saveBatch(taskItems)) {
@@ -365,7 +399,7 @@
//鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅
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()), false);
+ .eq(!Objects.isNull(orgLoc.getChannel()), DeviceSite::getChannel, orgLoc.getChannel()).last("limit 1"), false);
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
}
@@ -406,7 +440,7 @@
.setUpdateBy(loginUserId)
.setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateTime(new Date())
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setBarcode(orgLoc.getBarcode())
.setMemo(map.getMemo());
--
Gitblit v1.9.1