From 36dc88dd3f144c187a0e4b5636ee20ed88421a48 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 19:37:35 +0800
Subject: [PATCH] #sql
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 37 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 9d52495..06c2c73 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -44,6 +44,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.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -97,10 +98,9 @@
@Autowired
private BasStationService basStationService;
@Autowired
- private TaskService taskService;
- @Autowired
private LocItemWorkingService locItemWorkingService;
@Autowired
+ @Lazy
private WcsService wcsService;
@Autowired
private OutStockService outStockService;
@@ -109,6 +109,7 @@
@Autowired
private CheckOrderItemService checkOrderItemService;
@Autowired
+ @Lazy
private CheckOrderService checkOrderService;
@Autowired
private CheckDiffService checkDiffService;
@@ -123,6 +124,7 @@
@Autowired
private RemotesInfoProperties.RcsApi rcsApi;
@Autowired
+ @Lazy
private FlowStepInstanceService flowStepInstanceService;
@Autowired
private RemotesInfoProperties.WmsOpenApi wmsOpenApi;
@@ -180,7 +182,7 @@
TaskItem taskItem = new TaskItem();
BeanUtils.copyProperties(item, taskItem);
taskItem.setTaskId(task.getId())
- .setOrderType(OrderType.ORDER_IN.type)
+ .setOrderType(item.getType().equals(OrderType.ORDER_PRE.type)?OrderType.ORDER_PRE.type:OrderType.ORDER_IN.type)
.setSource(item.getId())
.setTrackCode(item.getTrackCode())
.setCreateBy(loginUserId)
@@ -791,14 +793,14 @@
@Transactional(rollbackFor = Exception.class)
public Task taskToTop(Long id, Long loginUserId) throws Exception {
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
+ Task tasks = this.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
if (Objects.isNull(tasks)) {
throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
}
//鍒ゆ柇娴呭簱浣嶄换鍔★紝淇敼浠诲姟浼樺厛绾�
modiftyTaskSort(tasks, loginUserId);
- if (!taskService.updateById(tasks)) {
+ if (!this.updateById(tasks)) {
throw new CoolException("缃《澶辫触锛侊紒");
}
return null;
@@ -963,7 +965,7 @@
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
}
if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
- Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
+ Task serviceOne = this.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getOrgLoc, loc.getCode())
.or()
.eq(Task::getTargLoc, loc.getCode()));
@@ -1184,7 +1186,7 @@
locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);
- if (!taskService.updateById(task)) {
+ if (!this.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -1241,7 +1243,7 @@
locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);
- if (!taskService.updateById(task)) {
+ if (!this.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
// 鐩樼偣鍐嶅叆搴撲换鍔＄粨鏉燂細灏嗗叧鑱旂殑鐩樼偣宸紓鍗曠疆涓哄凡瀹℃牳
@@ -1255,7 +1257,7 @@
*/
@Override
public void markCheckDiffApprovedWhenCheckInDone(Task checkInTask) {
- Task outTask = taskService.getOne(new LambdaQueryWrapper<Task>()
+ Task outTask = this.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getBarcode, checkInTask.getBarcode())
.eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type)
.last("limit 1"));
@@ -1333,7 +1335,7 @@
throw new CoolException("绉诲簱鐩爣搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- Task outTask = taskService.getById(task.getParentId());
+ Task outTask = this.getById(task.getParentId());
if (!Objects.isNull(outTask)) {
LocToTaskParams params = new LocToTaskParams();
params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());
@@ -2215,7 +2217,7 @@
return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()
.in(Task::getId, ids)
.in(Task::getTaskStatus, integers)
.orderByDesc(Task::getSort));
@@ -2229,7 +2231,7 @@
}
}
- taskService.pubTaskToWcs(tasks);
+ this.pubTaskToWcs(tasks);
return R.ok();
}
@@ -2355,7 +2357,7 @@
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
- if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
.set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -2379,7 +2381,7 @@
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
- if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
.set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -2508,32 +2510,45 @@
*/
@Transactional(rollbackFor = Exception.class)
public synchronized void removeReceiptStock(WaitPakinItem pakinItem, Long loginUserId) {
- WarehouseAreasItem itemServiceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
- if (Objects.isNull(itemServiceOne)) {
- throw new CoolException("鏁版嵁閿欒锛氳鏌ョ湅璇疯揣鍖哄簱瀛樻槸鍚﹀瓨鍦紒锛�");
- }
- Double workQty = Math.round((itemServiceOne.getWorkQty() - pakinItem.getAnfme()) * 1000000) / 1000000.0;
- Double qty = Math.round((itemServiceOne.getQty() + pakinItem.getAnfme()) * 1000000) / 1000000.0;
- itemServiceOne.setWorkQty(workQty).setQty(qty);
-
- if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
- .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
- .set(WaitPakin::getUpdateBy, loginUserId)
- .eq(WaitPakin::getId, pakinItem.getPakinId()))) {
- throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
-
- if (qty.compareTo(itemServiceOne.getAnfme()) == 0.00) {
- if (!warehouseAreasItemService.removeById(itemServiceOne.getId())) {
- throw new CoolException("鏀惰揣鍖虹墿鏂欏垹闄ゅけ璐ワ紒锛�");
+ if (pakinItem.getType().equals(OrderType.ORDER_PRE.type)){
+ if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+ .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
+ .set(WaitPakin::getUpdateBy, loginUserId)
+ .eq(WaitPakin::getId, pakinItem.getPakinId()))) {
+ throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- } else {
- itemServiceOne.setUpdateBy(loginUserId).setUpdateTime(null);
- if (!warehouseAreasItemService.updateById(itemServiceOne)) {
- throw new CoolException("鏀惰揣鍖哄簱瀹屾垚鏁伴噺淇敼澶辫触锛侊紒");
+ }else {
+ WarehouseAreasItem itemServiceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
+ if (Objects.isNull(itemServiceOne)) {
+ log.error("鏁版嵁閿欒锛氳鏌ョ湅璇疯揣鍖哄簱瀛樻槸鍚﹀瓨鍦紒锛�"+pakinItem.getPakinId());
+ return;
+// throw new CoolException("锛�");
+// throw new CoolException("鏁版嵁閿欒锛氳鏌ョ湅璇疯揣鍖哄簱瀛樻槸鍚﹀瓨鍦紒锛�");
+ }
+ Double workQty = Math.round((itemServiceOne.getWorkQty() - pakinItem.getAnfme()) * 1000000) / 1000000.0;
+ Double qty = Math.round((itemServiceOne.getQty() + pakinItem.getAnfme()) * 1000000) / 1000000.0;
+ itemServiceOne.setWorkQty(workQty).setQty(qty);
+
+ if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+ .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
+ .set(WaitPakin::getUpdateBy, loginUserId)
+ .eq(WaitPakin::getId, pakinItem.getPakinId()))) {
+ throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (qty.compareTo(itemServiceOne.getAnfme()) == 0.00) {
+ if (!warehouseAreasItemService.removeById(itemServiceOne.getId())) {
+ throw new CoolException("鏀惰揣鍖虹墿鏂欏垹闄ゅけ璐ワ紒锛�");
+ }
+ } else {
+ itemServiceOne.setUpdateBy(loginUserId).setUpdateTime(null);
+ if (!warehouseAreasItemService.updateById(itemServiceOne)) {
+ throw new CoolException("鏀惰揣鍖哄簱瀹屾垚鏁伴噺淇敼澶辫触锛侊紒");
+ }
}
}
+
}
/**
--
Gitblit v1.9.1